Git version management system

Get started

Create a new account on GitHub/BitBucket

https://github.com/

https://bitbucket.org/

Create a repository.

Copy the repository URL

Download GitKraken Git commands

git fetch -> Download files from remote repository but don’t touch local files

git merge -> merge downloaded files with local files

git pull -> git fetch & git merge

git add -> Add files or folders to the local repository

git commit -> Commits the local changes to the local repository

git push -> uploads your local repository to the remote repository

git branch -> Shows all branches (* shows current branch)

git branch -> creates a branch with the given name

git branch –delete -> Deletes a branch

Workflow:

Create a new branch and import the content of the master branch

$ git checkout -b newbranch Switched to a new branch "newbranch"

This is shorthand for:

$ git branch newbranch $ git checkout newbranch

^optional^

git pull -> do work -> git add -> ^git branch ^ -> git pull -> git push

merge to master: git checkout master -> git merge

IMAGE: git_everthing_is_local

IMAGE: git_overview

SSH keys

To work with an online repository, you need to have an SSH key which is imported into your GitHub/BitBucket account. This is required for identifying the user.

Tutorial

Minimum Configuration

$ git config --global user.name ""
$ git config --global user.email ""

Note: The global git configuration is stored i ~/.gitconfig

Create new repository

$ git init

Clone repository

$ git clone https://github.com/someuser/someproject.git

Check status

$ git status

Ignore specific files

The .gitignore file is used to exclude specific files from check-in.

Example of .gitignore file:

# Filter files
debian/file

# Filter folders
build/

# Filter file extensions
*.deb

Stage modifications

Add specific file

$ git add

Add every changed file

$ git add -A

Commit staged modifications

A commit adds the changes to the local repository.

$ git commit -m ""

or

$ git commit (you will be asked to provide a commit message

Show changes between working tree and staging area

$ git diff

Undo a modification

Be careful! Git checkout deletes the local changes of that file forever.

$ git checkout

Unstage modifications

This removes the previously staged modification from the staging area.

$ git reset

Reset all modifications

$ git reset --hard

Show changelog

This shows the changelog of all git commits

$ git log

This shows each entry on one line

$ git log --oneline

Show commit detail

This shows a commit in detail

$ git show

Rebase a branch

Place a branch onto another branch, commit or something like that. I don’t know. Do that with GitKraken or your repository is doomed forever. However, the git command would be

$ git rebase -i

Amend commit message

This changes the message of the last commit

$ git commit --amend

Rename a branch

git branch -m old_branch new_branch # Rename branch locally

git push origin :old_branch # Delete the old branch

git push –set-upstream origin new_branch # Push the new branch, set local branch to track the new remote

Delete a branch

Delete another branch

$ git branch --delete <branchname>